Remove class type on argument
Add instanceof for classes