Updated load once mechanism