Add more typedefs for return objects