Changes to work with SCL