Fixed misc issues. Removed baseModel.

Fixed misc issues with validating input. Removed unnecessary baseModel
class. Refactored.