Updated to reflect library requirements