Added libs + map fix