ServiceCatalog replaced by more generic BeanBox
Added get by id and related features to the BeanBox