Added keywords class and updated references