Add patterns HACK, REVIEW