Simplified methods with query generators
Added Javadoc comments
Changed handling return types