Added support for logic vars in raw argument