Further updates to writing policy and promises