Updated to allow more configuration.