Moved these to config