SUG-385 : Add simplecheckout support