Moving checking of required attributes to Model