Added ArrayList-based storage instead of ConcurrentHashMap