Library improvements