Updated typedefs