Re-add EE scheduler data support