NA-0: update class with custom validation annotation
Merge branch 'master' of https://github.com/fredxie/External_Rfp_Prototype