Addapted the info retrieving methods to work with future releases