Bump to 3.1.0, add Noop support