Refactored field access. Fixed generic definition.