replaced prefix hack with decorator
removed broken "pull" functionality from table since it was never going to work