Preparing to add Repository pattern