Typedefs added