Redesigned mapping API for future strongly type class members reference handling