Better string handling (+ regex support)

All strings under one dict now, also added support for regex strings