Update core-function to not depend Leo