Continued work on UI schema