Change: separating core functions from server