Change setup operation to get around database constraints