Improve Entities, add exceptions