Add pass handling functions & classes