Refactoring Database to Improve Queries Performance