Add waits in the proper locations for adding a mgmtsys