Refactor config

To make it more easy to extend/change defaults