Add check to see if family already contains entity, test system families