Added Opt Form classes and getters