diff --git a/state/application.go b/state/application.go
index <HASH>..<HASH> 100644
--- a/state/application.go
+++ b/state/application.go
@@ -45,14 +45,18 @@ type Application struct {
 // applicationDoc represents the internal state of an application in MongoDB.
 // Note the correspondence with ApplicationInfo in apiserver.
 type applicationDoc struct {
-	DocID                string       `bson:"_id"`
-	Name                 string       `bson:"name"`
-	ModelUUID            string       `bson:"model-uuid"`
-	Series               string       `bson:"series"`
-	Subordinate          bool         `bson:"subordinate"`
+	DocID       string `bson:"_id"`
+	Name        string `bson:"name"`
+	ModelUUID   string `bson:"model-uuid"`
+	Series      string `bson:"series"`
+	Subordinate bool   `bson:"subordinate"`
+	// CharmURL and channel should be moved to CharmOrigin. Attempting it should
+	// be relatively straight forward, but very time consuming.
+	// When moving to CharmHub or removing CharmStore from Juju it should be
+	// tackled then.
 	CharmURL             *charm.URL   `bson:"charmurl"`
-	CharmOrigin          *CharmOrigin `bson:"charm-origin"`
 	Channel              string       `bson:"cs-channel"`
+	CharmOrigin          *CharmOrigin `bson:"charm-origin"`
 	CharmModifiedVersion int          `bson:"charmmodifiedversion"`
 	ForceCharm           bool         `bson:"forcecharm"`
 	Life                 Life         `bson:"life"`
Add comment about moving CharmURL and channel to Origin