Added Entity base classes, Vector base classes