Refactoring: added generalized R/W table model