Added missing mcore classes, fixes #7