Add 'Keywords' model
Refactor loader