removed Transition interface
fixed warning
improved trigger resolver