some changes for a TS implementation
no polymorphic Basis and Mapping
no polymorphic Basis and Mapping