Refactor - new API helper class