Added OPTIONS command, needs a review