Modifications for synnefo integration