Refactor table entries parsing