Revert and add Reader

This reverts commit 7b5570f49101c32d03616d298f061f19328812a5.