Updated action listeners