Added base64 images support