Use !optional to avoid deprecation warnings