Added wrapper for images