Refactored serializers
Removed null checks