Better orm class detector
New binary