Moved config to machine