Add long long support