few updates to the data manager