Start removing raw check and force register to only accept a String