improve(): fixed api to be more consistent