[UPDATE] Complete lib