Add activesupport
Add do_resource_query back, fix specs