Added completion handlers to pop overrides