 Compare with functionality on Legacy application and implement missing features