More robust support for taking images