Addded versionless methods
Refactored queries
Removed unused code
Merge pull request #1 from Rhinofly/proposed-changes

Proposed changes merged into master.