Added camera support