adding environment variables management for arguments too