Add server database supporting

Resolved initial database issue