Move more to config based system