Added TODO, new storage type