Use module class instead of FBN