Adding DNS discovery
Maven fixes