Updated entity codes