Added code for configuration stuff