Better API
Fix for perfs