Update @api tags and add TODO items to Mapper/Header