Add guard and blacksmith support