Add required functions for the completion library #34 #35