Change Entity extends structure