Eliminate some code duplication.
Break container lookups into separate store file.
Rename method to better match ED API.