Moving to avoid mkt model imports on amo