Add unit class, and a find method