Refactor to allow group variables in plays