Add clientId and Secret as optional and change elastic database name