Changed Set to Map in BookShelf trait.