Changed resolve to class lookup