Entity system improvements