Improve data import
Split actions into controllers