Optimization, Entity changes

Moving toward flexible configurable Entity system