Add type matching