Make Repo optional instead