Adding better support for complete handling

Change-Id: I7e6fe0d8e518fa288c4efd31f38845ba775e94f3