Given the new changes, both functions were broken. This commit fixes them by implementing attributeName method within tabular functions and modifying how the attribute X & Y are created.