Added and updated classes