Need to check for management variable as well