updated comments and generated classes