Modify completion behavior