Adding conditional for R/W split support