Moved lookuptable to own Class
Same
Bumped version to 7.2
Null check is no longer needed