diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java
index 5a9ede8..b820e02 100644
--- a/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java
@@ -4,14 +4,22 @@
 package org.gcube.accounting.datamodel.implementations;
 
 import java.io.Serializable;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.Map;
 
 import org.gcube.accounting.datamodel.RawUsageRecord;
 import org.gcube.accounting.datamodel.SingleUsageRecord;
+import org.gcube.accounting.datamodel.UsageRecord;
+import org.gcube.accounting.datamodel.decorators.FieldAction;
+import org.gcube.accounting.datamodel.decorators.FieldDecorator;
 import org.gcube.accounting.datamodel.decorators.RequiredField;
 import org.gcube.accounting.datamodel.deprecationmanagement.annotations.DeprecatedWarning;
 import org.gcube.accounting.datamodel.validations.annotations.NotEmpty;
 import org.gcube.accounting.datamodel.validations.annotations.NotEmptyIfNotNull;
+import org.gcube.accounting.datamodel.validations.validators.NotEmptyIfNotNullValidator;
 import org.gcube.accounting.exception.InvalidValueException;
 
 /**
@@ -25,8 +33,21 @@ public class PortletUsageRecord extends RawUsageRecord implements SingleUsageRec
 	 */
 	private static final long serialVersionUID = 8339324883678974869L;
 	
-	@NotEmptyIfNotNull @DeprecatedWarning
+	@DeprecatedWarning @MoveToConsumerId
 	protected static final String USER_ID = "userId";
+	@Target(ElementType.FIELD)
+	@Retention(RetentionPolicy.RUNTIME)
+	@FieldDecorator(managed=MoveToConsumerIdAction.class) 
+	protected @interface MoveToConsumerId { }
+	protected class MoveToConsumerIdAction implements FieldAction {
+		@Override
+		public Serializable validate(String key, Serializable value, UsageRecord usageRecord) throws InvalidValueException  {
+			NotEmptyIfNotNullValidator neinnv = new NotEmptyIfNotNullValidator();
+			value = neinnv.validate(key, value, usageRecord);
+			usageRecord.setConsumerId((String) value);
+			return value;
+		}
+	}
 	
 	@RequiredField @NotEmpty
 	public static final String PORTLET_ID = "portletId";
@@ -43,14 +64,25 @@ public class PortletUsageRecord extends RawUsageRecord implements SingleUsageRec
 		super(properties);
 	}
 	
+	/**
+	 * Use {@link #getConsumerId()} instead
+	 * @return the Consumer ID
+	 */
 	@Deprecated
 	public String getUserId() {
-		return (String) this.resourceProperties.get(USER_ID);
+		return (String) this.resourceProperties.get(CONSUMER_ID);
 	}
 
+	/**
+	 * If correct,ly set is a duplicated for Consumer Id, use 
+	 * {@link #setConsumerId()} instead.
+	 * @param userId Consumer Id
+	 * @throws InvalidValueException if fails
+	 */
 	@Deprecated
 	public void setUserId(String userId) throws InvalidValueException {
 		setResourceProperty(USER_ID, userId);
+		
 	}
 	
 	public String getPortletId() {