Entity calls revamped but still unbuildable