Fix comments
Add function Image
Use extension aggregate