No Custom Entity thing is needed any more