WIP: Adding field weight for the class bundle.

#5738