Updates to structure to support tests