Move attribute checks to their own module from client