Most of config moved to seperate file