Separate more often used code into module
Employ new code for repositories