Updated Action handlers