Add better models.
part of #79.