Switched to build entity thing