DataManager and Constants updated