We may want to just make this a part of dagger (for some later release)