Better containers
Added config file