Working on core.Entity collision