Adding support for 'status-line' tokens