Change to List and add Keywords