Added simple tables support with bypass option