Move the numberCode workaround inside data model for now