Entity and Factory Updates