Added feature for lookup table