Moved remaining validations to builder classes