Don't pass the dev around
Change cp500 to use icucinema schema