Added a great deal of UI entities