Keep up with various spec/service changes
7 files changed