Configs && models refractored