Removed duplication of API helper class