Add new persistent servlet implementation, Refactoring + Bugfixing