Adding dependency and utility parts