Moving most entities to utilize the serializable base class.