Extracted config stuff into own ns