Ensure all methods are called correctly