Added image persistence classes