Changed the way keywords are stored.