Added support for camera