fixed serializers to work with the new modeling