Performances enhancements