Move keywords into its own model