Upgrade to LR 6.2

Upgrade to LR 6.2
Refactor classes to be easily extensible if adding additional attributes