Added Trigger that takes additional parameter.
Fixed Comments