Merge "Implement new API"