Move to yaml config