Cleanup + Added mode support for concurrent reads
Might be useful
Cleanup