Improve prototype