BAZYNGO-647 add changes to classes