Added changes to design, schemas, scripts and ui