Changed typedefs from private to public