Fixed some Bugs with Data Management