DatabseConnection and Service classes changed