Updated FR mapper and added FR incoming and outgoing in the domain model