Added keyword parsing