Update support for 3.6