Update entrypoint and composite entrypoint steps to be more readable and compliant with method inheritance
