Added entity and controller for FIRs