FIX #4: Add uniquify configurarion
Refactoring using constants