added more camera support