some changes
make typed entity writable
skip unnecessary setting of types