Created Factory database decorator to extend the SlotFiller return, since only the database can tell you what kind of item the SlotFiller is. Also changed the SlotFiller table so it has both the SlotFillerId as well as the SlotFillerSourceId