Improve Entity System.