Added more granular exposure of fields