Entities refactored and setter for Id added
details added to waiver