Refactored: Do not initialize repository dependent variables in constructor