Modified structure to be more [Go]-like