First shot at adapting to CDV 3 plugin architecture