Use new scribe-common helpers