Major update from Quadrum base