Improve interface and documentation