Added FriendlyUrl support