Refactor to use strong-oracle module