Addresses #52 - Querying now optimized to only query what is needed