Add key change support