Update from recent changes