Refactor Engine mutation methods