Made config more moduler to wm