Use commandjs module instead of own implementation