Incorporate @tasks tag and hook