Switch to action-based instead of extra locks