TS and Domain Model finished