Removed serializer and added configuration mgt