Updates to work with new GZRoster structure