Fix config

**WIP**

Implement changes in #68