Improved robustness and simplified interface