Update MW specific loading code

Change-Id: Id8e40d8b7eeb16c00ee33fe5ee6059c5de5c9ee3