Updated packages config
Added trivial layout
Extended model a little