Service stack refactor