Finalize, make WrappedMap prettier