Added completion options