Added live update support