More internal changes (wip)