Service stack refactor Update