Adding database support WorkInProgress