Feature/25 predis refactor