Added 'isa' type checking