Improved handling with variable and function resolvers