Updates to chainlock