Update maps

Resolves #36