Add more hreo image class rewrites