Moved and refactored eavropsTable