Refactor Element\Image and some samples