Removed hardcoded configuration values.