Add support for slocation and sredirect