Refactor RAPS with new AutoCSM FMU