Fixing a bug in a previous commit where the gateway would always be on
Cleaning up the feature intialization
Moved the saga initalization to the finalize stage to avoid issues with
ordering