Added some code to core actions.