Convert to 2.7 support