Updates made to allow for the ID field to be specified and replacement tokens to be used within