Adding completion functionality