Readd mechanic fields