Partial implementation of new vars structure