Fixed missing Range class
Fixed constructor