Added/changed generation methods