Let tests pass for now.
Added struct map