Add Inversion of dependencies (or attempt). Remove bulkUpdate