issue #20 - moving database support to separate packages