Added variable resolution in services