Add image managemet #22