Add standard-library mechanism (not tested)