Add generic mapper and controller