Add indicator model.
Renames for clarity.