WIP: Changing service loading sequence