Added new JNI headers that will replace the old ones
Updates to JNI implementation