Added tables support - kinda