WIP: Adding field weight for the class bundle.

#5738
Remove all the code similar to this.