Add some typedefs