Configuration clean-up
Adding control interfaces.