Make it module loaders compatible
Added f.x to replace f.method and f.property, improved regex