Made the data manager more flexible