Added completion facility for some options