Updated implementation to match newest VIATRA API