Added "Choose from library" option