Adding keywords, tuning regex