Add type/class recognition