Api additions to overlord, code refactorings