Better classes hierarchy