Refactor to pass axioms