Reworked family class