Added custom queries