more fields in the contract
fluent api
new package
Merge origin/master