include external deps; improve utils