Refactoring the fixtures registry functionality