+ Made state defined values non-system so organizations can add/remove them. Fixes #349