Updated autogeneration