[Library] More updates