Updates to Waterpig and config