Add support for servePath