Improved operations