Updated for Moqui 1.3