More work on camera support