Improve interface and comments