Added native method detection and stuff