Update to match nova style with enabled flag