Streamlined the data manager class and added key constants to data types.