Fixed Generator and added serializer generation