Update deprecated method
Improve select from library way