Added a first database support