Added completion stuff