Added initial support for database