Adding option in configuration instead of a constant (will be removed in 1.10 )