Improve admin + generate feature