Adding initial support for the SRR