Added and renamed classes