Change types in service
Merge branch 'master' of mayflower.github.com:Mayflower/timmy