AP2.1: added libraries