Move towards standard config etc.