Refactored to reflect removed utils project.