Rduran/improve raw images support