Re-added village model and added unit model.