Added and Updated Classes from testing