Added basic class