Simplifying API to match import style