Feature/gen use