Updated AFT-Common to contain equality methods for the entities