Adding parameter rules
Fixing conflicts on main production files