Added more data manager stuff