Magic numbers replaced with configurable values