Added validation and EntityPool.