Split threaded storage and non-threaded into different classes