Added database client support plus refactored installed etc