[na] refactory: simplify the API