Added mapping classes