Refactored SpearalEntity