More support for SRL