Updating system to use something more elegant looking than 'getEId'