Configuration controller
Added methods and tests