Switch from data to newtype