Added and modified classes