Added new experimental API
Optimization