Wee, updates to config handler