1) Refactor the code to remove cycle reference
2) Add fbp models for mapping