Feature/make full generator