Started adding basic database support