Refactor dict service to provide dict in