Service stack refactor

Update Enzos changes