Moved module options into fM options table