Added more utilities and dependencies