Improved assignment handling