Updated dispatch library