Added tables support.