More updates and regex generator elements