Improve API #23