More FM methods added

Never use using namespace in header files.