Config revamp