Polishing z8k simulator support