Refactoring
More queries added