Added motor and moved validations to separate class