Updated with separate regex libraries.