Added class for the new API implementation