Added client charm handler & charm of haste