Add type testing