Better definitions in the classes