Added completion code for options