Fix namespace for image decorator, add missing fields.