Do not use raw types; move sun xml serializer access to single class to be refactored