Adding entities and author support