Keep up with various spec/service changes
4 files changed