Updated compatibility to 3.7