Expanded upon BoltEntity