Updates for Sf 2.3 and MongoDB ODM