Improvements to Camera class