Adding support for 'status-code' tokens