Change remaining entities to extend AtomEntity