Fixed regex and finished migration