Adds maverick support