Add support for SDA separation