Added default values for internal types