Added s3 storage as well, and made api keys be created when a user is created