Improved Camera class