Added support for 10.7