Adding support with 10.7+