Improve collecting data about resources