Added preserve prefix functionality
Added preserve prefix functionality