Moved reactive functions to separate module