Refactor api to use Dependency-Instance Objects now