Better handling of config
Use new config setup in bin file