#401 Configuration revamp

Resolves #401