Improved support for exclusive commands