Added Class detection, for free or paid users.