API has been refactored.