Updated to do better API discovery
Updated version