Switch to mappend for backwards compatibility