Switch to new/save/create syntax for services