added the rest of Entities