Added direct server connections, Added batch job support