First part of EntitySystem integration