Added regexp mapping in tables names