Handle srsName better