Updated/New Composer support for Net_Geo

See diff for full changes