Replaced magic constant with option