Service stack refactor

Update changes.