Update features for map(limited for now)

Wanted to implement something generalized, but couldn’t figure out.
Right now, this should be enough.