Added basic class mapping functionality