Fix: Handle attributes with value = None