Added constant based for nil values