Made regex more advanced