Add model exceptions and update author