Added basic class support