A lot more changes adding of pocos and persistency managers etc.