Improved Tank and entity