Refactoring for Component model. Start specs for Supply.