WIP: Add initial version of HarpQueryServiceProvider