Persistence Bugfix (connection lost after long idle)
Refacroting in Request