Added singleton to logic handlers and loading