Added embedded images support