Refactor serializer + remove serialize on objects