Moved configuration feature back to original place (with some renaming)