Added database support to avoid install errors