Added model management for future search.