Add ToolbarBuilder
Refactor Descriptors
Update Models