This is an unneeded layer of indirection. Remove these 3 fields.