Introduced properties, cleanup, separeted import for network and location