Clean up Resource class, add SearchService