Removed some types, data collection