Added some reader-writer locks