Add more FM classess

Merged Dmitry Lukhtionov requested to merge fm_classes into master

Merge request reports