Added more methods to most classes