Adding support for apps to know primary/not-primary, #35