Added changes to queryable interface