10.10 and 10.31 support