Improvements in data handling (less querries to Database)