added fset:map support