Updates to Core and Web modules