Service changes to support XML marshalling of model classes. Upgrade Spring version.