Added support to find discarded batteries/models [Issue #17]