Updated to match the new services and data store models