Fix/Add some regex