mooncake: Changes for new extract method

Change-Id: I92b748c7a5d8a911c0aa949a536665b72c2703ab