Adds support for 3.7