Better NAN handling
Updated HPO annotations to latest version