Library update and Amount class introduction