Enhancements

Update is related to https://github.com/Link7/WPT/issues/5.