Updated for Asajz Core