Refactor so we don't directly reference PG store in the Resource classes