refactor of colocation manager