This is generic, so it should move into default values