CHANGE: Add more methods for unit entity holder class