Add State field to User and Project for a consistent Location