Add initial completion implementation