Performance significantly optimized
Merge https://github.com/ChickenDaddy/DBMSproject