Added type matching