Allow dynamic title
Refactor promise context chunk