Added support for multiple tables This enables the components to be used for both client and admin page rendering