Extracted image-parts, added hooks for fields