What's your opinion on putting $srv at the end of this signature for backwards compatibility?