Added more data collectors

Added more data collectors