Update version
Add instanceof