lib : Add class name support