Another bunch of architectural imrovements