Improve Spell and Identifier (Ids) factories and entities