Updated virtual columns management
Updated virtual columns management