Bump to 2.3.1, add wrapper