Feature/updateable entities import

This PR includes the other one. So we should merge that one first.