Enh/better api approach