Fixed Builders and updated Classes