Make Entities developer-friendly