Fixing issues after functionality split
global update