Improved regex and renamed task