Seperated the StoredEntities library.