Changed actions from lists to objects, to save space