Draft version with State->Raw mapping