Layout support
Added config support