Add Query module and setup specs