Improve Reader model and controller