added types to returned fields