Major improvement in OSM charms