Updated BaseTree for null and identity