I wish we could get to the point where we unify this with Setting - especially they have cyclic dependency.