Adding imaging support