Changed to a decorator that modifies to add a lookup table