Update to config and setup