Modified serializers and models to be consistent with associations