Add classes, effective date, translations and other various improvements
This refs affinitic #5863