Added additional syntax to make cleaner use of tap