Added id and publicId to class generation