Improved performance on db
Updated
Merge Master