Fix this with configuration management