Add Trigger System and fixes warning