Added camera functionality, and backwards compatibility