Updated transition callbacks