Improved support of operations.