Add transparent support for null features