Adding Model, Driver, and Helper capabilities