Add range support