#24 Adding fields/name wrapper methods