Added completion rules