Add multiple camera support
Improve camera support