Added support for Camera