Improve camera management