[#65] Move put_lookup to class