Added Class Parser