Modify getter and setter visibility
Add builder to echeance
Use builder and modify Commission building