Added auto-generated stuff