Fix connection problems
Add scheduler module