Work for Sufia integration