improve camera support