Added more to most classes