Upgrade to LR 6.2
Refactor classes to be easily extensible