Added exports safe