sync the handler with latest barrel change