Add Errbit support