Improve actions controller