more additions to definitions, revision to class metadata