changes to support scwala