Modifications for iMomo build