updated class & scene generators