Image classes refactor