Add world and improve entity