Add support for important and 0 values