Some import changes to Checkout class