lifecycle management improvements