Updated models and serializers