Add DependencySerializationTrait to various classes

This MR adds DependencySerializationTrait into classes that need it and also makes a couple of classes final.