Added more methods and references