Added ImageWrapper for easier test;