Adding 'equals' property check