Fixes Code Review - Readers poc2 (#8)