Implement the new entities