added custom regex & persistance into DB