Started to add assembly generation