updated optional types for consistency