Added basic class structure