Some mechanisms refactored