Changed serialization
Fixed the serializer and controller up