Add some will require the use of entity classes