Refactored curtailability design to more clean solution.