Added cmass wrapper around mass