Update to Kodkod with refactored template method