Added changes for use with tldcommonlib