made move regex dependent on move definitions