Refactors and add redis-server