Adding fanout module
More polishing