Use common model for configuration for view and XBot
Merge with master