Work on templating, more validation on api key creation