Added simulation menu support