Added support for `primary:` flag