Updated code to work with OS Commerce 2.3.1

More...