Adding basic class structure