Got rid of wrapper objects for isolation and migration model