Redis port
Redis port, context refactoring