Changes and additions for memory model