Update todo
Entity inheritance todo
Use VecMap as entity container