Added history and triggers