added typedefs to simply nested types