Removed @Canonical annotation