[IMP] change config model, small improv.