Add support for null or empty types