Slowly adding policy design to the components