Fix missing extension
Refactor actions